Cleaned up and added in the compute state.