Doubled up on the emerald removal code somehow, was causing multiple
issues.