Revert "Updates to makefile"

This reverts commit 400540173f9c4b77fecbb63eb654508eb525b6f0.