Revert "Minor additions"

This reverts commit 108e33411c1f6a9f90f66b7f6450fa0a03f4610d.