Only revert the clear_slug method

Revert "Revert "Simplfy update slug logic""

This reverts commit d6092fcf8d41972586b752af6466cb50325c85fb.