Remove etap target from the Makefile
Adjust timeouts to a sane cutoff