removed stuff from master branch