Removed unwanted commented code