get rid of namespace, we better do not use it as it makes things only more complicated and we did not really use it before