Optimize TAKE-CARE-OF-REMOVED