Cleanup some old code