Removed old tables, minor cleanup, migrated db