remove commented code and useless construcotrs used for dummy data before