further cleanup (make basedir KISS)