actually removed commented out lines