removed superflous context
Merge cleanup