By: md_5 <git@md-5.net>
Also remove a couple old/broken deprecated methods By: md_5 <git@md-5.net>
By: Bjarne Koll <LynxPlay101@gmail.com>