removing too much defaults here and there

Change-Id: I755c377386272c672976d633d6e15ae8c66b7507
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>