I shouldn't have commented out this block
Clean up