Fix makefile and and some config changes, also removing deprecated helper scripts