Removed most of the contrib externs.