Waedc qtc

Here comes some cleanup Ervin. Please check if correct and pull in if ok.