Bug fix removing debugging variables