ADMIN: even more tidying up