Corrected imports, removed unused variables and suppress forced warnings