Finish cleaning joint based optimization