Cleanup of code with no functional change