Utils: Cleanup code