removed some old code, updated SS + modules