Remove hardcodes