Removed foolish TODOs