Removed unused flags and history