Removed some refactored code

Now that we've normalized some things here, we can remove extra methods that is only used in one instance