Update to 1.6 and remove outdated methods, unsure as to what the results are