Revert "merge residues in master"

This reverts commit d7f73f3b41f2650564c48c78ce9f32f66b23fa9f.