More make clean up