fixing namespacing declaration.
and of course removing the bad things.