Removed ugly testing code from LegacyAppModel