redundant code, cleanup