removed obsolete and useless stuff