typename removed from all functions