Clean up to prepare new version of API