removed demo hooks
merge fix