Remove HardCode