Remove unnused methods, reorganize things
Remove unnused methods, reorganize things

artsy/force-public,xtina-starr/force,erikdstock/force,izakp/force,erikdstock/force,anandaroop/force,oxaudo/force,damassi/force,izakp/force,damassi/force,xtina-starr/force,izakp/force,mzikherman/force,mzikherman/force,oxaudo/force,erikdstock/force,damassi/force,anandaroop/force,cavvia/force-1,eessex/force,eessex/force,erikdstock/force,cavvia/force-1,artsy/force-public,yuki24/force,damassi/force,eessex/force,joeyAghion/force,artsy/force,oxaudo/force,yuki24/force,eessex/force,oxaudo/force,mzikherman/force,xtina-starr/force,joeyAghion/force,joeyAghion/force,yuki24/force,xtina-starr/force,artsy/force,mzikherman/force,anandaroop/force,yuki24/force,artsy/force,cavvia/force-1,joeyAghion/force,cavvia/force-1,anandaroop/force,artsy/force,izakp/force