Remove not essentially needed lines
Add some CapDwarf aware comments and switches