Remove CM stuff and add in Eclipse overlays