Clean up redundant code.