Cleanup redundant remove_query_args()