removed tracing and a lot of debugging options