removed not needed files and condensed code