used some felpado
removed unused code