removing hardcoded refs