Removed unused import
Cleaned up compiler warnings