Cleanup. Moved to Makefile
More cleanup