code cleanup
more make clean fixes