Remove 3 unused and almost useless functions