More rust layers cleanup