Removed experimental code from master branch