Small references cleanup