Minor cleanup

Two things:

* Removes some more redundant code
* Updates the usage of `Plek` to treat it as a normal class and not a singleton