Remove spaces to resolve smokey failures