Work on CartoDb remove
Move layer cleanup up to NPMap.Map