Updated to v2.1.5.8

Removed all extra code near the bottom that was no longer required and
was pretty much just crap filling.