Revert "Makefile adjustments and clean up"

This reverts commit 54c593c8c1d72b65718f5f7a9c2878d906b20921.