dlm: master - dlm: clear out old stuff and build system