Removed code not specific to lastest iteration