wp bit of cleanup
Signed-off-by:wolfhesse <wolfgang.schuessel@gmail.com>