Fixed warnings, removed unused imports