removing trash files
code simplification