Cleanup due to s_all