Issue #144: Removing commented code