Keeping all these deprecated methods around isn't healty

/me had problems reading the source, so me made it readable again so me
can make better docs ;_;