Revert "Various additions"

This reverts commit 4c2570cc6538019e59602834ada3c00899cef747.