deleted more stuff for new interfaces