Bug fix & cleanup

Bug fix (update on existing ss20 wasn’t working)
Simplification of the code.
Bug fix & cleanup

Bug fix (update on existing ss20 wasn’t working)
Removed unnecessary lines