remove un-needed context preservation