cleaned up some minor imports