Avoid memory leak by removing cyclic dependency.

Avoid memory leak by removing cyclic dependency. #68