Unsuppressed warnings and removed unused imports