remove unnedded patches and confs
Merge pull request #54 from vonfritz/upstream-master

remove unnedded patches and confs