Removing deprecated/unused/outdated code