simplify: remove default instances of layers, strip Layer in name