Remove unused code and some lint fixes