Motor declaration cleanup