code clean up of imports. ready for release?