Remove obsolete parts of TODO item #1