Revert "Do not have to check for values as they are alway there from default values"

This reverts commit fa1d55040e7abf818240a9d02e73e11f4a8497a9.