Cleaned the Makefile, ported small changes, we dont have tracers
functions enabled. so no need to block in Makefile