removed deadcode and minor cleanup... -sai