Remove ControllerDevice and ControllerHandler from the makefile