Cleaning up Makefile and the ccl+h only script to run Jenkins builds