fixes, removed obsolete stuff