Removed commented execution from build, and added debug to control