Cleaned up disused imports
Removed disused methods