Remove separate files
Remove unused stuff form Makefile