Cleaned old TODO