Dropping some unused code
Merge