Revert "Some minor cleaning up."

This reverts commit fbcbd5148ff8da11041f7f93db45846dfe92976e.