Removed some TODOs and debugging code.