Remove hardcoded code