* Removed some extraneous debugging functions, old typedefs, etc