Revert "merge conflict resolved"

This reverts commit 11f50f8068857488777d1c0bfd88868b0c14c51c.
Revert "cleanup"

This reverts commit 4df4184ba68b1ff6ad27f9862ed1a66ca5d14fcb.
Revert "Improved arch detection to deal with odd numbers of peaks via taking care of half gaussians. Not yet tested."

This reverts commit db9ae47b51ec66098eb16af421ad392aec5dfe68.