Cleaned up some unused imports & whitespace