[Kinatt]

I say remove them, but chris has a valid point too. So you are kind of at a standstill, remove or let be until its re-implemented. I personally say let stefan figure it out.