Removed dummy output and leftover TODOs