Deleting objects not as hacky now