Removed the last piece of original code