Remove deprecated line and update cleaner