Removed comment out codes