Removed some local references