Removed comment out code