Cleanup final design