Clean up some kruft