removed/changed obsolete code