Fix extension API
Cleanup before publishing on CWS