Makefile cleanup

BKrev: 4133ac3e73kqGf_Qar8uW2-Yh2yGRg