No branch id in filepath

The branch id was added to the path of files in DBContentHandler, thus a new file entry is created the first time a file is modified in a new branch and was added in an another one. Theses two commits fixes this and also removes unused local variables. It partially fixes issue #42.