Cleaned up commented out old safety code.