removed unnecessary code, adapted assert messages