Stupid Regressions caused by commenting & cleanup