removed hacky reuse checks