Package cleanup
No xparse warnings