Cleanup, add onCreateUser and onDeleteUser API methods