Cleaned out methods identical to EntityBoat