Revert "Added addtional functions ..."

This reverts commit b58d94864d0454f5c9d3479b2c547b4854060b0f.