remove obsolete code
broken! work in progress
resolves #7