EPD-192:Remove unused variables and settings
Merge branch 'master' of github.com:dma-enav/EPD