Makefile adjusted, unnecessary stuff deleted