Removing unused stuff, for now.