removed unnecessary enter/exit functions