Finish check 02 cleanup
clarified