third commit - cleanup