Removed deprecated method and fixed some typos.

Sorry about the first two, IntelliJ uses .* for imports so I reverted that and did it all over again ;)