Removing leftovers from Nick's implementation