removing hardcoded stuff