Cleaned up Makefile
Removed wrapper
Removed Config func