removed unnecessary payment and charges files
merge conflicts