Revert "bits and pieces"

This reverts commit 07caf4666d98a8749431e9d1935ff6b4275c7e45.