refactor drop constraints grammar