Removed stuff to put it in a seperate branch"