Remove unused functions

Part 2