Removed some commented out codes.