Add Utils and Cleanup