Good bye, MJ, it was nice to have known you.
Also got rid of a few unused APIs.