Removed UnusedImport warnings