Removed redundant code and code that could overwrite a user's configuration