remove unused features

Change-Id: I0e42083fee1d9bec3ed4af1baf45dbd56b96d462