Removed all the anonymous function