Revert "Adding some of Achim's code"

This reverts commit 623ad19a5c72ea6f27a1132fa6ab200a3c72033e.