General/clean up

@mhvk if no objections - merge