Added context-aware code cleaner for calls