cleanup and model testing