Removing a few other functions so I can rewrite them from scratch.