Removes isDefined-get instance

Rewriting some not pretty code.