cleanup
Fix for T3-1171