removed buggy remaps