Clean up utility lib