removed extraneous things