Renamed stuff + removed unused cmd stuffs