remove ss
Merge branch 'testing'