Revert "Makefile adjustments and clean up"

This reverts commit 9b6669c8da5c4419b9e132771fa77a66bc3c9419.