removed useless fields, line of code and images