Removing context allocating

Change-Id: Ia5b1544d5c7f5a4905ce352ee1f7c5e355869847
Signed-off-by: TanelDettenborn <tanel.dettenborn@gmail.com>