Cleanup of commented code