LPS-35875 Removing unnecessary configuration options