remove redundant code, cleanup