Finished removing demo_servo and shortened some MSG's