Remove unused stuff for now