Removed database stuff from main app