Removed the 'TODO' pieces