Remove overly-specific funcs
Merge pull request #1 from samsalisbury/patch-1

Remove overly-specific funcs