removed emit where not required