Remove hardcoded stuff