Some clean-up of files (maintained locally) and FB.ui test.