Fix drawer and remove useless preferences

Change-Id: If69bb770721a35c6809db89bbd2b1268a4c1ba30