Cleaned up - Removed all unused imports and tested