removed unused activity/xml, some other renaming