Feature/david 6.2 cleanup

Merging cleanup branch...