Rollback imports optimization (checkstyle warnings)