Removed addressed TODO