Removed flavio and update planning