add missing imports
remove unused import in database util