Deleting unused functions
Tests are passing again