PASDK-218: Clean up the code removing deadwood.