Removed unused function
Fixed missing imports