Removed old tables, did some cleanup, migrated db