Removed empty method, and some unused imports