cleanup, remove redundant code.