clenup Point & MapController