Removing some unused stuff, etc.