update sources to new format and remove unneeded functions from Makefile