Clean up makefile

Change-Id: I4eb7238faea9ba2b448176e65e03e05c497c87d4