Remove unused stuff in utils package