Still trying to figure out how to clean all of this up without deleting