Fixed a bug with the mapping, removed some stuff