Untested: More code cleanup

Shouldn't affect behavior