Removed spurious functions