Remove duplicate processing block
Deal with relative paths more sanely