major cleaning from substrate layout interactions
minor cleaning