removed 2nd motor stuff, removed merlin