Remove warning supression
Remove unused imports
Added database	stuff. Fixes #2