Removed code not ready for master branch