Remove useless setter for the time being
Fix whitespace
Remove leftovers of timeout handling