Removing some unused stuff