Also removed the now unused deploy subpackage and fixed the makefile
accordingly.