Renamed activities and deleted more unused activities