Removing (for the moment) non-functional API calls