adopt to new extraction api
remove ExtractClosureAction
simplify ExtractAction and some clean up