remove extra stuff and add Moto Stuff