minor clean up
minor clean up v2
removing dead code