removed namspaces which is not needed