Removed commented out cruft