PLAT-40 removing it from app context