removed deprecated stubs, deleted unused files