Cleaned up some unused imports