Clean up additions from @sideshowbarker