Revert "test update"

This reverts commit 2f59c2f5dd9d9dfca4bcbeee898c4ac965bef43c.
Revert "removed outdated code (marked as bw)"

This reverts commit 8fcb775c29e91cf3712c3459688df0b851d1d911.