removed theows in all subs