dev_1.0

Please remove codes that you will not use anymore po.