Remove unused immutable classes