Removed experimental functions

Has corrections for the master branch. Will merge.