Clearing out funny business
I think this is working now