simple organization
removed unwanted DatabaseManager