(Apple input) Cleanups