cleanup, customization and API 3.11 update