Framewire 3 general clean-up.