Removed old code
Cleaned up old code
Updated import statement