[WIP] some cleanup