Removing commented out code now that I've backed it up to another branch