Added cleaner routes