Remove unused code from other packages
Fix lint errors