Mod heirarchy cleanup