Removed unwanted/commented code