add motor lib. cleanup.