all are removed i think ... please review & test