Issue #1489

finally the useless defaults got removed