Removed some garbage, cleaned up imports