Removing the template generation that was left behind when the API was
updated in 22fb5c47

Also cleaned up many unused methods left behind