Create and then comment out buggy removal code

Fix ASAP