partial cleanup - code still not working