Cleanup of commented out lines and no longer needed attributes