cleaned User and Base
cleaned done