Removed no-longer needed code (incl. commented out code). Also, some code formatting.