Clean up Elevator Entity, and start using floors