roemove extraneous code