removed logging and unused NS