Revert "Added singleton property"

This reverts commit 4460b16272d1017c01703643f1cada6d19f81ca6.