removed cruft, dummy symbol for debugging, cleaned up namespaces