cleanup commented