Cleanup

+1 from erjay.