Fixed issue #350
"'delete' seems to have issues with explicit index values" Additionally, the code was cleaned up in multiple files
Authored by: numere 2018-07-11
Parent: [r356]
Child: [r358]
