Merge "Remove dead module definitions"