Revert "need for testing"

This reverts commit 8512a5001a70fe419aaf0388911b87df21b63ec0.
Revert "Makefile optimization"

This reverts commit 03ccd26b3c5ab6a1711155ac90fc054ee1f4d11b.