cleanup and baseline