More cleaning up of converted code