WIP: cleanup moto code