Fixed portfolio weights calculation and clean up data/config files