Remove code from the legacy application as in base