more skip_depth cleanup