Conflict check and skip_remove code cleanups