Removed unused stuff