Utils cleanup (WIP)