Cleanup
Cleaned up XMODs