taking out more unused stubs