Cleanup headers

Change-Id: I8c2645918c78bbc42e119d8aaa7bca0569d2622f
User group and system pool proposals

Change-Id: I78a3bb1efacc2c0d0efe798090b59c4c3337f24e