Cleanup - Remove more comments