afix and cleanup