More default sruff removed