Updated makefile, setup.cfg and removed unused files.