Cleanup some cruft that crept in here...