More rc.lua cleanup