remove mapping
more changes