cleanup commented out stuff