(david): remove control/ updated Makefile