I added this stuff for a reason, I suspect that just getting rid of it without any other code to account for it is not going to go well.