remove useless comments and impore shell conditions