model specs; cleanup