Removed commented out code not needed