Updated Cleanedup Setup