Cleaned up configuration code.
Forgot to update cmake.