Removed solved issue note + TODO