Remove unusable Makefile
Refactoring