-Removed some unused stuff