another bunch of deletions