remove type and acitivty from final