Compiler suggested cleanup