removes unused components
updates main Makefile