clean up #2 - fixed building (or so it seems)...