Remove duplicate supporting screens, Clean activity transitions