NOBUG: Clean already implemented TODO