Quick update to remove testing code