Cleanup of previous commit which included some extraneous lefovers from