Removed un-working trace code
* Removed trace tests