add exit on error and remove unsed code/comments