Clena up and remove rollback