Remove Hardcoding part