Remove unused code that has issues

Hello @nicks, 

Please review the following commits I made in branch 'xiao-remove-problematic-and-unused-code'.

a5bf5a3fceb26d478f2dea6e79a158e72a63904f (2014-04-06 00:04:47 -0700)
Remove unused code that has issues

R=@nicks