Improved decrapification