Remove debug messages, use relative paths