Remove some hackery