Cleanup headers in SimpleShell