Cleaned up some stuff left over from before the redesign.