Remove commented code. Clean up default values.