Took out extensions from master branch