Removed untested stuff from master branch