Cleanup and remove debug output