Remove unwanted anonymous functions

Change-Id: Ieefbd58fbc829182048df1d89921b97599a3392c
Merge "Remove unwanted anonymous functions"