Clean makefile and travis ci files up