Remove hardcoded ids