Clean-up redundant code