WIP final cleanup