Delete code related to Namespaces

Change-Id: I0f55e8a8a4306654bfb16926d03abdd5df68142b