Removed commented gunk