Remove deprecated code

Change-Id: Ia93f9350369d6f6d43d736139b3a5cc70a27dd17
Merge "Remove deprecated code"