removal of Santa's wish list items

Summary: and we go back to original code

Test Plan: no plan

Differential Revision: https://phab.face.isis.vanderbilt.edu/D8