No need to keep ref to methods only used one.

Add some TODO