remove SHORTNAME as we no longer need it (use basedir instead) >> master