Cleaned up RobotMap