Updated to use remove_double_slashes()