Remove useless functions and useless tests
temp 2014-10-17T14:48:08-0700