Removed some of Nick's accidental commit