Mbst 7423 remove old app objects

Tests will be updated