Removed unused features
Tidied up several methods which had workarounds for limits in older pph
versions
Whole class should now be lighter and more efficient