Update makefiles, remove functions that weren't needed