cleanup in enhancers
Added TODO