Remove unneeded code
Minor fixes to namespace
Remove unwanted dependency