Drop PiXLS, update mappings