Remove statically defined addresses they are no longer needed