Revert "More configuration"

This reverts commit dd4e8818e10728fd28b1f953721d9562545c6bce.