remove unused private method
clean up some code