API update to 9 and cleanup