Card #213 remove view and map