Removed experimental, unfinished and obsolete code from master branch