Removed some unused stuff so they don't cause a warning