Remove unused code and lib jar