Removing the old API version 1 code