Removed unused code and mappings. Basically nuked some of last nights wtf-solutions and left only what was really needed