Cleaned up some old inefficiencies