Makefile adjustments and clean up

Change-Id: If4a6d639853a1d6f04700353ee2bd7481e332915