removed obsolete and not working stuff