Removed unused things