remove commented *entry definitions; changed model of ref to m.basic.plus.access