Fix up multilayer module
Remove all multilayer references in surge code