Fix make install for packages; Remove unused code