- clean up redundant code