Removed some unused variables, Makefile fix