Removed unneccessary code due to when v3