removed code which is not mapping related