[polish] Clean up code

[amalej]

There currently is a bunch of comments and redundant code. Purpose of these is to make it easy to debug and revert if errors happen.

Remove once no longer needed