Some bugfixing.
Remove stale comment to self