Clean up some old janky stuff