- removed extraneous conditional do end blocks