Removed dead and/or debugging code.