removed some of the legacy warnings