Fix default settings
Remove unnecessary functions