Remove useless overlays and fixed double device settings

Change-Id: I705e8c7b33317de58ee206aa7959574045db77e8