[WIP] Some cleanup