removed unnecessary headers and functions, fixed makefile