cleanup of unused code