Add input cleanup

It should, but I'm not sure it behaves like we assume. :smile: