Removed handling of defaults, too many assumptions hardcoded
Merge branch 'remove-none-handling' into develop