Cleaned up unused imports/vars/methods