Removing hard coded weights