Removing unused libs and classes