Removed unused files, half-added DB support for multiple unis