removed namespace handling