removing a bunch of unused functions and useless wrappers