remove obsolete code, make new code compile