Pre-Final Interface Clean-Up