Revert "Streamlines some APIs slightly. Calirified some methods on the"

This reverts commit b96236787e0f962b1ab96a818a0b05d9a44af787.