Summary:Removing code again

Detailed Description:

Dev/QA impact:
QA testing notes:
Bugs fixed:
Reviewer:
Spec link (optional):
Third-party code (optional):