Removing things that are incompatible with 2.0
More reomval