Remove min suffixes from a few files until optimization is working