removed obsolete rubbish in main