Remove unused namespace
Mark private fns