Heidi - code clean up

deleted commented out code