fixed make file bug and removed unused code