Cleanups before starting on IDML support