Cleaned up Gazebo simulation stuff