fix namespace issue and remove unwanted stuff