Removing some last remnants of old code