Remove old depracated code