debugging and cleanups