activity removal + various changes