Seemingly repeating myself in removing non-existant functions