Cleanup debugging lines and fixing 'combined' directory name