Cleanup some bad code in here.