removed trash, restored makefile