#1573652 just some cleaning-up