fixes #6035

cleaning up local tree