Remove unused option
Use DB user option
Remove unused imports