Remove unused backwards-compatibility code

Change-Id: Iffa42d7579d882cd119851a075b6e63f670c02bc