removed old code

related to merging context