Remove mapping. It is just not flexable enough.