Clean up some excess imports