removed some relicts from main