fixed unused imports and added surpress warnings