remove activities and layouts that we do not need and minor changes to some layouts but not final