sim fix & cleanup