removed obsolete code, fixes #11