cleaning up based on changes to -api