remove memwatch, because it is not compatible with 0.11.9
User city module as a testbed
Resloved conflicts