move to molgenis_apps/apps/catalogue (buggy classes, only used in catalogue app)
resolve findbugs warnings