2nd commit to cleanup