Drop two useless functions
More cleanup