Utils cleanup