Removed confusing singlular-version methods