Remove a bucket load of unused functions