Remove scaffolding stubs and Deprecated APIs that aren't used according to study