s4-common: remove unused entries

Change-Id: If1d7b050e23ccbc42415e89763ecb22c301cfad1