Debug clean up