Removed dead code, removed some debugging artefact.