Simplify common resources, no need for flags

Change-Id: I00800387102b00634a13c7a51a1a2bc19e5bb884