remove some redundant functions, fix-up reference counting
1 file changed