remove submodules and simplify Makefile