More massive cleanup of remaining files, only CustomUI is left