Unnecessary codes and files removed