Remove deprecated usage of keywords in Mix