Remove some cleanups from the rust code