fix makefile file dependancy
cleanup some unused imports and Results