Remove extra code we won't be using