Fix properties field (allow whitespaces for -D)
Fix empty string
Remove unused code