Removed some unused stuff