temporarily remove some additional features, fix some makefiles