deactivated more stuff