Cleaning up some usings and general compile clean up.