Removed exit and dpr functions