Removed unnecessary files from database package
Merge branch 'kostas'
Removed unnecessary imports