removing a lot of functions we werent using.