Removing unneeded pieces

slimdown for the win.