Eliminate temporary code