Remove coverage and add debugging info