Cosmetical fixes, and add a Makefile.
Drop unused stuff.