Clean up - dead code, unnecessary clones, Makefiles