Remove annoying assumtions.