Config option cleanup;
Cleanup code;