Remove old code.

Some old code was commented out, it's no longer needed.
Version bump 1.3.6-rc.1
Update changelog
Version bump 1.3.6
Merge branch 'release/1.3.6'
Merge tag '1.3.6' into develop

Release: 1.3.6
Preparation for new development cycle after release 1.3.6