Removed _s references