Remove final unnecessary finals