Remove unused imports, use standard bean naming
Merge remote-tracking branch 'origin/master'