clean up some stray imports, etc.
get fully functional