utils package cleanup