Removed unnecessary code from v1.