remove many database call , modified filesystem structure