atlas40: props cleanup

Change-Id: If7fcd17cd4a20b3c10b002210c04e3cffa2db254