clenaup: remove commented out code