Cleaned up ThirdParty CRUD screens.