removed some immediate mode