Changed class structure, view structure, eliminated stuff