more cleanup on api content