remove obsolete stuff to fix building