Removing things for merge

Corey also has these functions but mine don't work in the way we decided
will be best.