after removing the extra two compartments from the database, simplify views now that all compartments are relevant